From 91b0d4561853c69cb8872e5d61b6abdf1099dc0f Mon Sep 17 00:00:00 2001 From: Michael Schumacher Date: Fri, 25 Aug 2006 20:36:10 +0000 Subject: [PATCH] added AC_LIBTOOL_WIN32_DLL as a preparation for proper builds of shared 2006-08-25 Michael Schumacher * configure.ac: added AC_LIBTOOL_WIN32_DLL as a preparation for proper builds of shared libs on win32 & there's no need to define OS_WIN32 here... * babl/babl-extension.c: ...if the only place where it is needed can be handled by HAVE_DLFCN_H --- ChangeLog | 8 ++++++++ babl/babl-extension.c | 2 +- configure.ac | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1930f10..6dbbfdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-08-25 Michael Schumacher + + * configure.ac: added AC_LIBTOOL_WIN32_DLL as a preparation for + proper builds of shared libs on win32 & there's no need to define + OS_WIN32 here... + * babl/babl-extension.c: ...if the only place where it is needed + can be handled by HAVE_DLFCN_H + 2006-08-24 Øyvind Kolås * extensions/Makefile.in: diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 9fbac8a..2352586 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -138,7 +138,7 @@ destroy_hook (void) #include #include -#ifndef OS_WIN32 +#ifdef HAVE_DLFCN_H #include #else void *dlopen(const char *, int); diff --git a/configure.ac b/configure.ac index 4a9bb92..d77a5e6 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(no-define) AC_PROG_CC +AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL AC_STDC_HEADERS AM_SANITY_CHECK @@ -125,8 +126,6 @@ AC_MSG_RESULT([$os_win32]) AC_SUBST(PATHSEP) AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") -AC_DEFINE(OS_WIN32, 1, "Define to 1 if you are compiling for Microsoft Windows.") - AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes") dnl =========================================================================== -- 2.30.2